| @@ -34,13 +34,13 @@ RailsWebsiteTemplate::Application.configure do | ||
| 34 | 34 | #config.action_mailer.delivery_method = :smtp | 
| 35 | 35 |  | 
| 36 | 36 |    # config.action_mailer.smtp_settings = { | 
| 37 | - # :address => "smtp.mandrillapp.com", | |
| 38 | - # :port => 587, # ports 587 and 2525 are also supported with STARTTLS | |
| 39 | - # :enable_starttls_auto => true, # detects and uses STARTTLS | |
| 40 | - # :user_name => "james.peret@gmail.com", | |
| 41 | - # :password => "UZIxm2vCtBr66yWRpC_Big", # SMTP password is any valid API key | |
| 42 | - # :authentication => 'login', # Mandrill supports 'plain' or 'login' | |
| 43 | - # :domain => 'rails_website_template.dev', # your domain to identify your server when connecting | |
| 44 | - # } | |
| 37 | + # :address => "smtp.mandrillapp.com", | |
| 38 | + # :port => 587, # ports 587 and 2525 are also supported with STARTTLS | |
| 39 | + # :enable_starttls_auto => true, # detects and uses STARTTLS | |
| 40 | + # :user_name => ENV["MANDRILL_USERNAME"], | |
| 41 | + # :password => ENV["MANDRILL_KEY"], # SMTP password is any valid API key | |
| 42 | + # :authentication => 'login', # Mandrill supports 'plain' or 'login' | |
| 43 | + # :domain => ENV["DOMAIN_NAME"], # your domain to identify your server when connecting | |
| 44 | + # } | |
| 45 | 45 |  | 
| 46 | 46 | end | 
| @@ -63,7 +63,7 @@ RailsWebsiteTemplate::Application.configure do | ||
| 63 | 63 |  | 
| 64 | 64 | # Ignore bad email addresses and do not raise email delivery errors. | 
| 65 | 65 | # Set this to true and configure the email server for immediate delivery to raise delivery errors. | 
| 66 | - # config.action_mailer.raise_delivery_errors = false | |
| 66 | + config.action_mailer.raise_delivery_errors = false | |
| 67 | 67 |  | 
| 68 | 68 | # Enable locale fallbacks for I18n (makes lookups for any locale fall back to | 
| 69 | 69 | # the I18n.default_locale when a translation can not be found). | 
| @@ -77,4 +77,22 @@ RailsWebsiteTemplate::Application.configure do | ||
| 77 | 77 |  | 
| 78 | 78 | # Use default logging formatter so that PID and timestamp are not suppressed. | 
| 79 | 79 | config.log_formatter = ::Logger::Formatter.new | 
| 80 | + | |
| 81 | +  config.action_mailer.default_url_options = { ENV["HEROKU_APP_URL"] } | |
| 82 | + | |
| 83 | + config.action_mailer.delivery_method = :smtp | |
| 84 | + config.action_mailer.perform_deliveries = true | |
| 85 | + config.action_mailer.raise_delivery_errors = false | |
| 86 | + config.action_mailer.default :charset => "utf-8" | |
| 87 | + | |
| 88 | +  config.action_mailer.smtp_settings = { | |
| 89 | + :address => "smtp.mandrillapp.com", | |
| 90 | + :port => 587, # ports 587 and 2525 are also supported with STARTTLS | |
| 91 | + :enable_starttls_auto => true, # detects and uses STARTTLS | |
| 92 | + :user_name => ENV["MANDRILL_USERNAME"], | |
| 93 | + :password => ENV["MANDRILL_KEY"], # SMTP password is any valid API key | |
| 94 | + :authentication => 'login', # Mandrill supports 'plain' or 'login' | |
| 95 | + :domain => ENV["DOMAIN_NAME"], # your domain to identify your server when connecting | |
| 96 | + } | |
| 97 | + | |
| 80 | 98 | end |